From: Glenn Morris Date: Mon, 12 May 2014 06:59:30 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~1662 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bbbabffe06d4c763534d5be92844c48a3f8746e2;p=emacs.git Merge from emacs-24; up to 2014-05-12T06:15:47Z!rgm@gnu.org --- bbbabffe06d4c763534d5be92844c48a3f8746e2 diff --cc admin/ChangeLog index 7af23b779ef,68bf62070be..87da4f7e26b --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,4 -1,14 +1,12 @@@ -2014-05-11 Glenn Morris ++2014-05-12 Glenn Morris + + * find-gc.el: Move here from ../lisp/emacs-lisp. + -2014-05-10 Glenn Morris - + * admin.el (set-version-in-file): Don't set identical version. + (set-version): Provide default version number. + (set-version, set-copyright): Give start/end messages. + -2014-04-17 Paul Eggert +2014-04-18 Paul Eggert * notes/bzr: Update instructions for merging from gnulib. Remove obsolete note about tramp.el and tramp-sh.el. diff --cc lisp/ChangeLog index 52c1f0c164a,3cfb50cafd0..0de3533c6c4 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,53 -1,71 +1,104 @@@ + 2014-05-12 Stefan Monnier + + * emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled + into autoloading just because of a silly indirection. + -2014-05-11 Santiago Payà i Miralta (tiny change) ++2014-05-12 Santiago Payà i Miralta (tiny change) + + * vc/vc-hg.el (vc-hg-unregister): New function. (Bug#17454) + -2014-05-11 Glenn Morris ++2014-05-12 Glenn Morris + + * emacs-lisp/find-gc.el: Move to ../admin. + -2014-05-10 Glenn Morris - + * printing.el (pr-version): + * ps-print.el (ps-print-version): Also mention bug-gnu-emacs. + + * net/browse-url.el (browse-url-mosaic): + Create /tmp/Mosaic.PID as a private file. + -2014-05-10 Stefan Monnier ++2014-05-12 Stefan Monnier + + * emacs-lisp/nadvice.el: Support adding a given function multiple times. + (advice--member-p): If name is given, only compare the name. + (advice--remove-function): Don't stop at the first match. + (advice--normalize-place): New function. + (add-function, remove-function): Use it. + (advice--add-function): Pass the name, if any, to + advice--remove-function. + -2014-05-09 Philipp Rumpf (tiny change) ++2014-05-12 Philipp Rumpf (tiny change) + + * electric.el (electric-indent-post-self-insert-function): Don't use + `pos' after modifying the buffer (bug#17449). + -2014-05-09 Stefan Monnier - - * subr.el (function-put): Add function. - -2014-05-09 Stephen Berman ++2014-05-12 Stephen Berman + + * calendar/todo-mode.el (todo-insert-item-from-calendar): + Correct argument list to conform to todo-insert-item--basic. + -2014-05-09 Glenn Morris ++2014-05-12 Glenn Morris + + * files.el (cd-absolute): Test if directory is accessible + rather than executable. (Bug#17330) + + * progmodes/compile.el (recompile): + Handle C-u M-x recompile from a non-compilation buffer. (Bug#17444) + -2014-05-08 Juri Linkov - - * dired.el (dired-check-switches, dired-switches-recursive-p): - New functions. (Bug#17218) - (dired-switches-escape-p, dired-move-to-end-of-filename): - Use `dired-check-switches'. - (dired-insert-old-subdirs, dired-build-subdir-alist) - (dired-sort-R-check): Use `dired-switches-recursive-p'. - -2014-05-08 Glenn Morris - + * net/browse-url.el (browse-url-mosaic): + Be careful when writing /tmp/Mosaic.PID. (Bug#17428) + This is CVE-2014-3423. + +2014-05-11 Stefan Monnier + + * mouse.el: Use the normal toplevel loop while dragging. + (mouse-set-point): Handle multi-clicks. + (mouse-set-region): Handle multi-clicks for drags. + (mouse-drag-region): Update call accordingly. + (mouse-drag-track): Remove `do-mouse-drag-region-post-process' hack. + Use the normal event loop instead of a local while/read-event loop. + (global-map): Remove redundant bindings for double/triple-mouse-1. + * xt-mouse.el (xterm-mouse-translate-1): Only process one event at a time. + Generate synthetic down events when the protocol only sends up events. + (xterm-mouse-last): Remove. + (xterm-mouse--read-event-sequence-1000): Use xterm-mouse-last-down + terminal parameter instead. + (xterm-mouse--set-click-count): New function. + (xterm-mouse-event): Detect/generate double/triple clicks. + * reveal.el (reveal-close-old-overlays): Don't close while dragging. + + * info.el (Info-quoted): New face. + (Info-mode-font-lock-keywords): New var. + (Info-mode): Use it. + + * emacs-lisp/lisp-mode.el (preceding-sexp): Exclude leading "," which + are a hindrance for C-x C-e. + +2014-05-11 Leo Liu + + * net/rcirc.el (rcirc-sentinel): Fix last change. + +2014-05-08 Sam Steingold + + * net/rcirc.el (rcirc-reconnect-delay): New user option. + (rcirc-sentinel): Auto-reconnect to the server if + `rcirc-reconnect-delay' is non-0 (but not more often than its + value in case the host is off-line). + +2014-05-09 Eli Zaretskii + + * progmodes/grep.el (lgrep): Fix a typo in last commit. + +2014-05-09 Glenn Morris + + * files.el (file-expand-wildcards): + * man.el (Man-support-local-filenames): + * printing.el (pr-i-directory, pr-interface-directory): + * progmodes/grep.el (lgrep, rgrep): + * textmodes/ispell.el (ispell-call-process) + (ispell-call-process-region, ispell-start-process) + (ispell-init-process): Use file-accessible-directory-p. + 2014-05-08 Stefan Monnier * xt-mouse.el: Drop spurious/oddly shaped events (bug#17378). @@@ -89,15 -107,17 +140,17 @@@ (tramp-remote-coding-commands): Enhance docstring. (tramp-find-inline-encoding): Replace "%t" by a temporary file name. (Bug#17415) + This is CVE-2014-3424. -2014-05-06 Glenn Morris +2014-05-08 Glenn Morris * emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value. (find-gc-source-files): Update some names. (trace-call-tree): Simplify and update. Avoid predictable temp-file names. (http://bugs.debian.org/747100) + This is CVE-2014-3422. -2014-05-05 Stefan Monnier +2014-05-08 Stefan Monnier * minibuffer.el (completion--try-word-completion): Revert fix for Bug#15980 (bug#17375). diff --cc lisp/gnus/ChangeLog index c97ad7fc0a2,3807fa9df0d..dad0444fcb2 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@@ -15,8 -2,9 +15,9 @@@ * gnus-fun.el (gnus-grab-cam-face): Do not use predictable temp-file name. (http://bugs.debian.org/747100) + This is CVE-2014-3421. -2014-05-01 Glenn Morris +2014-05-04 Glenn Morris * gnus-registry.el (gnus-registry-install-p): Doc fix. diff --cc lisp/url/ChangeLog index f3426656038,408f659681f..aba4a2c53e8 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@@ -1,4 -1,9 +1,9 @@@ -2014-05-09 Michael Albinus ++2014-05-12 Michael Albinus + + * url-handlers.el (url-file-handler-load-in-progress): New defvar. + (url-file-handler): Use it, in order to avoid recursive load. + -2014-05-01 Glenn Morris +2014-05-04 Glenn Morris * url-parse.el (url-generic-parse-url): Doc fix (replace `iff'). diff --cc lisp/url/url-handlers.el index 9a05746ebff,b0f01123bbb..c86acb680d0 --- a/lisp/url/url-handlers.el +++ b/lisp/url/url-handlers.el @@@ -143,29 -145,24 +146,33 @@@ like URLs \(Gnus is particularly bad a "Function called from the `file-name-handler-alist' routines. OPERATION is what needs to be done (`file-exists-p', etc). ARGS are the arguments that would have been passed to OPERATION." - ;; Check, whether there are arguments we want pass to Tramp. - (if (catch :do - (dolist (url (cons default-directory args)) - (and (member - (url-type (url-generic-parse-url (and (stringp url) url))) - url-tramp-protocols) - (throw :do t)))) - (apply 'url-tramp-file-handler operation args) - ;; Otherwise, let's do the job. - (let ((fn (get operation 'url-file-handlers)) - (val nil) - (hooked nil)) - (if (and (not fn) (intern-soft (format "url-%s" operation)) - (fboundp (intern-soft (format "url-%s" operation)))) - (error "Missing URL handler mapping for %s" operation)) - (if fn - (setq hooked t - val (save-match-data (apply fn args))) - (setq hooked nil - val (url-run-real-handler operation args))) - (url-debug 'handlers "%s %S%S => %S" (if hooked "Hooked" "Real") - operation args val) - val))) + ;; Avoid recursive load. + (if (and load-in-progress url-file-handler-load-in-progress) + (url-run-real-handler operation args) - (let ((url-file-handler-load-in-progress load-in-progress) - (fn (get operation 'url-file-handlers)) - (val nil) - (hooked nil)) - (if (and (not fn) (intern-soft (format "url-%s" operation)) - (fboundp (intern-soft (format "url-%s" operation)))) - (error "Missing URL handler mapping for %s" operation)) - (if fn - (setq hooked t - val (save-match-data (apply fn args))) - (setq hooked nil - val (url-run-real-handler operation args))) - (url-debug 'handlers "%s %S%S => %S" (if hooked "Hooked" "Real") - operation args val) - val))) ++ (let ((url-file-handler-load-in-progress load-in-progress)) ++ ;; Check, whether there are arguments we want pass to Tramp. ++ (if (catch :do ++ (dolist (url (cons default-directory args)) ++ (and (member ++ (url-type (url-generic-parse-url (and (stringp url) url))) ++ url-tramp-protocols) ++ (throw :do t)))) ++ (apply 'url-tramp-file-handler operation args) ++ ;; Otherwise, let's do the job. ++ (let ((fn (get operation 'url-file-handlers)) ++ (val nil) ++ (hooked nil)) ++ (if (and (not fn) (intern-soft (format "url-%s" operation)) ++ (fboundp (intern-soft (format "url-%s" operation)))) ++ (error "Missing URL handler mapping for %s" operation)) ++ (if fn ++ (setq hooked t ++ val (save-match-data (apply fn args))) ++ (setq hooked nil ++ val (url-run-real-handler operation args))) ++ (url-debug 'handlers "%s %S%S => %S" (if hooked "Hooked" "Real") ++ operation args val) ++ val))))) (defun url-file-handler-identity (&rest args) ;; Identity function diff --cc src/ChangeLog index 72e78724bab,2283677a448..5d06882cee7 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,4 -1,13 +1,13 @@@ -2014-05-11 Glenn Morris ++2014-05-12 Glenn Morris + + * fileio.c (Ffile_executable_p): Doc tweak. + -2014-05-10 Jan Djärv ++2014-05-12 Jan Djärv + + * xsettings.c (init_gsettings): Use g_settings_schema_source_lookup + instead of deprecated g_settings_list_schemas if possible (Bug#17434). + -2014-05-07 Paul Eggert +2014-05-08 Paul Eggert * minibuf.c (read_minibuf): Avoid C99ism in previous patch (Bug#17430). diff --cc test/indent/perl.perl index 0bfcc98356b,aca478a1375..34cd4af1125 --- a/test/indent/perl.perl +++ b/test/indent/perl.perl @@@ -1,13 -1,20 +1,24 @@@ #!/usr/bin/perl # -*- eval: (bug-reference-mode 1) -*- + use v5.14; + + my $str= <